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

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



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