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: 6ed5cf04

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



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