Merge "Fix NSSL bottom margin with 3-button nav and no split shade" into tm-dev am: e2b71171

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



Change-Id: I7dfa645359fde8f5275967b7702add8ff0644edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>