Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb am: fb1ee89c am: 5310bc6a am: bc98e85d

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



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