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 am: d7524365

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

Change-Id: Ia038100ab49460ba9e99e39d5354a5b07126f92f