Merge "Enable media session flag by default" into tm-dev am: 7e5c325086 am: d32b746c6e

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

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