Merge "Fix NSSL bottom margin with 3-button nav and no split shade" into tm-dev am: e2b711716d am: e9593d2543 am: 43bc40d9c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18815957 Change-Id: I9efb892d2a966453e057db5885de34fd87090f12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: