Merge "Merge "Don't show estimate with center notch" into sc-dev am:...

Merge "Merge "Don't show estimate with center notch" into sc-dev am: 7bb24f63 am: 21650df2" into sc-v2-dev-plus-aosp am: a37f1a61

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

Change-Id: I063a129c71f72a08603d706f7b7235455d0dfe54