Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
am: ce7d1ab3bb

Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a