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

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



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