[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -s ours am: 6a14b5344e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4697b590153258486493ea46ba5cf1a07a3ded67
tree: 2b393083d369c0e3d37eca44e936e802c5306b12
  1. src/
  2. Android.bp
  3. CleanSpec.mk