Merge "Merge "Add long press menu to remove media player" into rvc-dev am: c285c18e am: 53c36be4 am: cf4560d4 am: 0e3c2462" into rvc-qpr-dev-plus-aosp