Merge "Merge "Fix broken android.view.DisabledTest." into oc-dev am: d5d4ffebdd" into oc-dev-plus-aosp