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 am: 1b3f73f0 am: 68002428

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



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