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

Change-Id: I968352866d021c4b188a841969c7133246a143ce