Merge "Merge "Update the flag in system UI rather than reposting the notif"...
Merge "Merge "Update the flag in system UI rather than reposting the notif" into qt-dev am: 7babaf90 am: 918aa7a0" into qt-r1-dev-plus-aosp
am: 26977f8b
Change-Id: I60fefce4b194ecef78d6877aabdb76c843dc5d3e