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

Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168 am: 20de84c7 am: 798abc8d

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



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