[automerger skipped] Merge "Change the icon of connected notification" into...
[automerger skipped] Merge "Change the icon of connected notification" into rvc-dev am: 6ce3a483 am: 25797d76 am: 36395e7f am: 87afe46b -s ours
am skip reason: Change-Id I276f48550631ac654cc7a6426329414ff0fa0963 with SHA-1 063fb8b8 is in history
Change-Id: Ifca6dd200947d501153fd0d70604795579be0fa2