[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -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: I42140b7f4355e2d29f751ed0a454fe54254635b7
tree: c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
  1. src/
  2. Android.bp
  3. CleanSpec.mk