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

am skip reason: Merged-In I2087170aceb7c0670afd04fcc779047aa95a373f with SHA-1 0e459673aa is already in history

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

Change-Id: Ife2f6fb0e39e46724a09a8e059f5442eed22c90a
tree: c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
  1. src/
  2. Android.bp
  3. CleanSpec.mk