Merge "Merge "Ensure service info is updated so that checking for remote...

Merge "Merge "Ensure service info is updated so that checking for remote service uid returns the correct value." into tm-dev am: 31b9a4cb am: ebe89c5c am: 40da2b12" into tm-qpr-dev-plus-aosp am: 35b68ba1

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



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