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 am: c3f059f9

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



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