[automerger skipped] Merge "Merge Android R" am: 7ea932074b -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: I61fd56bb5b7423bde6ba6d98c88505ca13999e15