am 7da7d85c: am 181c19f0: am 2937d9a8: am a5ef3505: Merge "CTS verifier crashes while executing the "Notification Attention Management" test" into lollipop-mr1-cts-dev

* commit '7da7d85cd4f41fe3cd66a6b85d5e5ef921b86df8':
  CTS verifier crashes while executing the "Notification Attention Management" test