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

Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb am: f69d601d am: a30f8d61

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



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