[automerger skipped] Merge "Migrate frameworks/base/apex/extservices to...

[automerger skipped] Merge "Migrate frameworks/base/apex/extservices to packages/Modules/ExtServices/apex" into rvc-qpr-dev-plus-aosp am: cf2c19f7 -s ours

am skip reason: Change-Id I6f6df644221cf7fafb09485f2cec937fd33b69cb with SHA-1 30a90819 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12975025

Change-Id: I53ae0d8f39d0b6a3db5a0376674ddc7ba6e3716d