Merge "Prevent privacy dot overlapped by cutout" into sc-v2-dev am: efec6624 am: 3d7e1743

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

Change-Id: Ie481b6e7428ad98a744d492e0f19ec0d668882a0