Merge "Always report keyguard-going-away even if empty" into udc-dev am: 26994f4d

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



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