[automerger skipped] Merge "Add default phone/sms to battery whitelist apps." into pi-dev am: 89722d829e
am: 32cb24c5c9  -s ours

Change-Id: I5017028520f91b1dea4aa6629d5066c1f5e0f895