Merge "Set default value of battery percent preference" am: 145caf7d am: b4d2e7da

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617



Change-Id: Ifd81c0ea3c845d9f48b5eef143357960f21a66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>