Merge "Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am:...

Merge "Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168 am: 5d0d6297" into tm-d1-dev-plus-aosp am: af4e70f5 am: 9d3815cb

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



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