Merge "Ensure the game mode setting doesn't conflict with available modes" into sc-dev am: 6b843a1b8c am: 3c4a49dfa4 am: 0dbe214766
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457704 Change-Id: Ie4e083bb2dd7a7849551af6cf9ea1adcf3d7e6a9
This commit is contained in: