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

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

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