Merge "Automatically register the existing media button receiver on API 21+" into nyc-support-25.1-dev
am: 8b95545bc3

Change-Id: Ia239b54074ac438230432177aad32e1a8919971f