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

Change-Id: I763da86e30e389e99074cfa2a822285cd60d0219