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

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

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