Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e am: 321163990e" into oc-dr1-dev-plus-aosp