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

Merge "Reland "Make extra navigation bar count towards non decor frame""" into tm-qpr-dev am: 367ff5a1

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



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