Merge "Merge "Fix Certificate authority installed notification is gone when...
Merge "Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf7 am: a3e767a7" into nyc-mr1-dev-plus-aosp