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

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



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