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

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

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



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