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

Change-Id: I7e00e745c8aa2ddb6232747d4371dc3194be28ef