am 284c161b: 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 '284c161b85dbc5b1e041b3874bd9e4d0b21ff425':
  Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity