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

* commit '2937d9a8cb65142644a47c5757aeb166d9a79c5e':
  CTS verifier crashes while executing the "Notification Attention Management" test