[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 9d0f1c35df -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: I7457d92d8215b53c6da6aba234489a10c3349a01
tree: 7d4d6ba3dee0f4aaa9b30e5c542526eb34771aa3
  1. Android.bp
  2. CleanSpec.mk
  3. src/