[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 9d0f1c35df -s ours am: c56d0141a8 -s ours am: dc9ce0f7b7 -s ours

am skip reason: Change-Id I69b76603053fa88c407d2401a9738cac216432e4 with SHA-1 8c4f391b0b is in history

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

Change-Id: I2451b31497cf31be0faa471aedd0b6f2a1229e48
tree: 0b0da8be4248bd04ec2fe56615164978ec9596ef
  1. Android.bp
  2. CleanSpec.mk
  3. src/