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

Change-Id: I7d026257ee7e95fac7c03b786c79661ea834e831