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

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



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