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

* commit '181c19f06806b3bb40d744bd64574776c6720125':
  CTS verifier crashes while executing the "Notification Attention Management" test