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

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

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

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

Change-Id: I6366814382fac06c3a0cd06e4446c6a2bdfca426