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

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

Change-Id: I3b6df5b6d7423150ffcf94b6e653fe5984958596