[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: aee82e345d -s ours am: 2a130094e3 -s ours

am skip reason: Change-Id Iee24bff1511bbf6a3407700147811020cc269c7f with SHA-1 dc9ce0f7b7 is in history

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

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