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

This reverts commit 620e91578cb5d0bbfbf6f8c5aedb77e23c13ef49.

Reason for revert: b/238985243

Change-Id: I1fc82c61b445b6f5ceedb2ec8b727e8e745f47c9
11 files changed