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

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



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