[automerger skipped] Merge "[DO NOT MERGE] Make extra navigation bar count...

[automerger skipped] Merge "[DO NOT MERGE] Make extra navigation bar count towards non decor frame" into sc-v2-dev am: b262f3b2 am: 7f6d47f1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b8d0142bf502759ed923446051a6238b7b502d4