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

Merge "Revert "Revert "Make extra navigation bar count towards non decor frame (3/3)""" into tm-qpr-dev am: 58e5c2d0 am: b3db1269

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



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