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

Merge "Revert "Revert "No NavigationBar layer in tablets""" into sc-v2-dev am: 3d9545ef am: ff74bd5b

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

Change-Id: I3a951464d65d29f3e3073eb8f1a8f081a5f1c563