Merge "Fix NSSL bottom margin with 3-button nav and no split shade" into...

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

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



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