Merge "Revert "Reland "Make extra navigation bar count towards non decor...

Merge "Revert "Reland "Make extra navigation bar count towards non decor frame"""" into tm-qpr-dev am: 661d0530 am: 65851bb2

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



Change-Id: I83c73910a7a9ff4f294b4a6fd0b84b4bf6f0795c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>