Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am:...
Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d am: 32116399" into oc-dr1-dev-plus-aosp
am: bce79b1b
Change-Id: I0c54ee4c5a0ef11c8e7e6ddc07ce15ad0bd4c6c3