Android S V2 Beta 3
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours

am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history

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

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