Merge "Enable media session flag by default" into tm-dev am: 7e5c3250 am: 333f159e am: 23a433bc

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



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