Merge "Start enforcing explicit intents for Context.bindService()"