Merge "Migrate frameworks/base/apex/extservices to packages/Modules/ExtServices/apex" am: f860dff75b

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

Change-Id: I6509ea85a3b1acb15a90814a68f68f1581001627