[automerger skipped] Merge "Merge Android R" am: 7ea932074b -s ours am: 77fa0e89df -s ours

am skip reason: Change-Id I02ad49d6b2c3344b90108ee0933a82bd2244dfd8 with SHA-1 aee82e345d is in history

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

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