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

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