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

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



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