Merge "Revert "No NavigationBar layer in tablets"" into sc-v2-dev am: 5214873aa8

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

Change-Id: I6ac88f9f81b2b1e1e29ebff81f4449898e8fefda