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: a16277f7 am: 4560e2fc

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



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