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

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



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