Merge "Fix failing GameManagerServiceTests" into sc-qpr1-dev am: 6925a160d0

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

Change-Id: I7f28fcfda03894ace6e8dc138bbb9e822e5967c3