Revert "Make extra navigation bar count towards non decor frame"

This reverts commit c68d151f.

Reason for revert: Breaking launcher(cf_tablet) and windowmanager tests(cf)
Bug: 224404595

Change-Id: I36f057365029d6f0c8edc61e41b783205363b456