[automerger skipped] Merge "Reevaluate game service when provider changes"...

[automerger skipped] Merge "Reevaluate game service when provider changes" into tm-dev am: f78e5ab3 am: c7d09ff7 -s ours

am skip reason: Merged-In I5d0a603b98f341b956ea6abe82930fa13f4f7d0e with SHA-1 0f5e540c is already in history

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

Change-Id: Iee8c6a616d84d9b7b1abe18a7e312daca3e6b4d6