Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am: 89722d829e

Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5