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

Merge "Revert "Revert "Revert "Revert "Make extra navigation bar count towards non decor frame (3/3)""""" into tm-qpr-dev am: ba3d01f1 am: 96ba8820

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



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