[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c21e847348 -s ours am: 3e6f48b1db -s ours

am skip reason: subject contains skip directive

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

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