Merge "Merge "Add new methods to activate/deactivate session" into tm-dev am:...

Merge "Merge "Add new methods to activate/deactivate session" into tm-dev am: c9daa032 am: a0c4f697 am: e1e10d07" into tm-qpr-dev-plus-aosp am: de84c018

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



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