Merge "Fix ToastTest.testAccessMargin on H watches" into stage-aosp-pi-cts-dev am: 9b337137a7
am: dfedd22954

Change-Id: I6b4ecef6ebfb9906862ae88576fc1bdda50940fe