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: 1b369876 am: 98233f4d

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



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