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

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



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