[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: 0ef53904 -s ours am: 54ae584c -s ours
am skip reason: Change-Id I276f48550631ac654cc7a6426329414ff0fa0963 with SHA-1 d63b5b73 is in history
Change-Id: I9582db9650ff8c9e5143881a8b57b73040b6ecc8