Merge "Revert "Revert "Enable media session flag by default""" into tm-dev am:...

Merge "Revert "Revert "Enable media session flag by default""" into tm-dev am: 6cfc6da0 am: 8a40f4ef am: d1ba99eb

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



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