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: 20de84c7 am: 798abc8d" into tm-qpr-dev-plus-aosp am: 08e2fc17

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



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