[automerger skipped] [DO NOT MERGE] Make extra navigation bar count towards non decor frame am: b356de42b0 am: d504eefb24 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id3f78aea668fb59fcab318a9f1092833b2acab92