[automerger skipped] Make AOD battery text field support BatteryDefender am: 30f92a367d am: 363cb09c7d -s ours

am skip reason: Change-Id I74f32136ba034d2dea19f71e1e7cecc022cd9fa9 with SHA-1 eeda14fbb2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13090497

Change-Id: Iefb8286550271136014981e10e648a0da9e79650