Merge "Merge "Move media setting to a constant, disabling it" into rvc-dev am:...
Merge "Merge "Move media setting to a constant, disabling it" into rvc-dev am: 2d8266cd am: 6e64ac66" into rvc-d1-dev-plus-aosp am: 4d6366e6 am: 1c0723be
Change-Id: I7ddf3fa18d7ba42d053598fc02a01d93d50aefc7