Merge "Disable media actions override flag" into tm-dev am: 4304b4b0 am: b3173474

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



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