Merge "Don't suspend personal SMS app" into rvc-dev am: 55bf41c9 am: c48743fc am: e41672ae am: eb285c62 Change-Id: Ibf8005a12e3a044cafce4287bca8d9cd99b9ad43