am b4a0c47c: Merge "Port CtsVerifier to API 21 Notification Listener API. DO...
am b4a0c47c: Merge "Port CtsVerifier to API 21 Notification Listener API. DO NOT MERGE." into lmp-dev
automerge: 2c5747aa -s ours
* commit '2c5747aa':
Port CtsVerifier to API 21 Notification Listener API. DO NOT MERGE.