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

Merge "Revert "Revert "Revert "Make extra navigation bar count towards non decor frame (3/3)"""" into tm-qpr-dev am: 6e0e72c8 am: 8b435707 am: dd59d6da am: a02f2d64

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



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