Revert "Update NavigationBarView.java"

This reverts commit eecaab31d6d54066c669f88fe255f5b31ad016a9.
Revert "Merge remote-tracking branch 'github/cm-11.0' into HEAD"

This reverts commit 93ff80f939dd633acced3ca2a7394b44f28374fa.