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

Merge "Make extra navigation bar count towards non decor frame (3/3)" into tm-qpr-dev am: 861c268d

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



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