Merge "Merge "Ensure GameSession is not destroyed when restarting game." into...

Merge "Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb am: fb1ee89c" into tm-d1-dev-plus-aosp am: 3f764852 am: fb4c009a

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



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