Revert "Make extra navigation bar count towards non decor frame (3/3)"

This reverts commit 6a6fbd2eb7a44e9519acaf30b428b0d16c91b33d.

Reason for revert: DroidMonitor: Potential culprit for Bug 246909852

Change-Id: I8979d1e4ed83bfbe092ad0c9f446c0d99d86245d
1 file changed