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: 40da2b12

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



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