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

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



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