am c9ba0735: am 90585d8a: am 55bc2132: am cb3ed032: Merge "Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity" into lollipop-mr1-cts-dev

* commit 'c9ba0735fbd1ec2236c5e99c59f7f6cc97612153':
  Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity