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 am: 2d3df291

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



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