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: 5f48cb12 am: 114ff037 am: c4ebf895

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



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