Merge "Retain old logic for prohibiting battery estimate on the devices with...

Merge "Retain old logic for prohibiting battery estimate on the devices with center cutout." into tm-qpr-dev am: ce066a86 am: e5455483

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



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