[DO NOT MERGE] Make extra navigation bar count towards non decor frame am: b356de42b0

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

Change-Id: Idc8a000a31ff0e02ebf6f45fa6c17f3476894a65