Merge "Fixing the menu overlap with the system bars under half oval type."...

Merge "Fixing the menu overlap with the system bars under half oval type." into sc-dev am: 0112603d am: 56a24987

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

Change-Id: I3965a1f3cb9ac5d0cf3e302841d67b5b13dcd278