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

Change-Id: Ic96a571c015fd814d38fd3747e3610e6ff375590