[automerger skipped] Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev am: ce7d1ab3bb
am: 85d843f72d  -s ours

Change-Id: Ieb58d9b8ef64af319e433e36a2d9a20acab002fa