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

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



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