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
Change-Id: I64c92d217745c0cf1eee9bca6254116fc1b1858b