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

Change-Id: I666e18c2e1ddb559a1887176eed85585542eb1e8