Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am: 25c84b3321" into oc-dr1-dev-plus-aosp