Merge "[automerger skipped] Merge "Merge "Merge "Set public version of notification in CtsVerifier for Nougat" into nougat-cts-dev am: aadc40e4e6" into nougat-mr1-cts-dev am: b5292b71f4" into oreo-cts-dev am: c35474babc -s ours
am: a9ec78a1a5 -s ours
am skip reason: change_id I63429151d759940e79f8c42ec720ad56aef7e740 with SHA1 2d45b6fbb4 is in history

Change-Id: I62f5c5cab04a1aeea2f06411bd09b21af41e85c6