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

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

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



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