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

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

Change-Id: I5f38675ad2a2b79c019c647486ad4f13c10c906e