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