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: b7f93cd2

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

Change-Id: I6bb719238b2cfb747227b96150e74b2a12ad0229