[automerger skipped] Skip ab/6749736 in stage. am: 2cd9a666dc -s ours

am skip reason: Change-Id I718f4b712d88e240f69f8230b6d60c13b41f4b70 with SHA-1 90caf11575 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/12796091

Change-Id: I686cbb22ffaf9a4a998960e63676026ea3b4a13b
tree: 27d8378cdb568e851bc7790007133952fb31309a
  1. Android.bp
  2. CleanSpec.mk
  3. src/