Merge "keyguard: fix delay lock screen sound" into cm-11.0
(cherry picked from commit 819df632a49cbedfbaec4669b9b3d8f962315e49)
Merge "Addition of automobile profile and group apps" into cm-11.0
(cherry picked from commit b729d862fcaec790b87db0e8cbeca0263fa88df7)