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

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: f6ff5eba am: 356d1453

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



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