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

[automerger skipped] Merge "Migrate frameworks/base/apex/extservices to packages/Modules/ExtServices/apex" into rvc-d1-dev-plus-aosp am: f1cabefe am: d629ed80 -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/+/12975004

Change-Id: I7a9da165ecc8d2027e746aa7bc8d66e58dbbd552