Merge changes from topic "b288868098_delGetSvc" into udc-qpr-dev am: 9cca2318 am: d3839140

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



Change-Id: I75149a68739dc849258029c835be52cbe6888eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>