Merge "Merge "Change GlobalActions emergency icon to star of life." into...
Merge "Merge "Change GlobalActions emergency icon to star of life." into qt-dev am: 2f86e743 am: f9e7681f" into qt-r1-dev-plus-aosp
am: 60cc1086
Change-Id: I939fdf32447b3606e52b9daef57aaefa442fa4c8