Merge "Merge "Resolving a TODO in AppWidgetService" into rvc-dev am:...
Merge "Merge "Resolving a TODO in AppWidgetService" into rvc-dev am: a5a576d9 am: ce34fde1 am: 23763ec7" into rvc-qpr-dev-plus-aosp am: 8c8ebd72
Change-Id: Iccd150f7264425826f8c4f274862a0274ac663bb