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 am: 6343a92c am: 8b5de306

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



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