Merge "Revert "Make extra navigation bar count towards non decor frame (3/3)""...

Merge "Revert "Make extra navigation bar count towards non decor frame (3/3)"" into tm-qpr-dev am: c6588c2f am: 18ed5591

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



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