Merge "Adding logging for expansion state during unlock transition" into...

Merge "Adding logging for expansion state during unlock transition" into udc-dev am: 13cebac1 am: a4b4d8d6

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



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