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

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

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