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

[automerger skipped] Merge "Migrate frameworks/base/apex/extservices to packages/Modules/ExtServices/apex" am: f860dff7 am: e7ac9962 -s ours am: 42f6aca8 -s ours am: 69a6f44a -s ours

am skip reason: Change-Id I654ba2791a1c8a782c04409ae756a6be335e0306 with SHA-1 2284f7e4 is in history

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

Change-Id: I71a08ab80689d80c00e12422bc633e5f3327a07a