Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am: ab8d4cf645

Change-Id: If1ed361c6f8c7008271cf1da4317c9ac47a5af73