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

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



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