Merge "Do not respond to ACSD if authing for keyguard" into sc-dev am: 09cb5879a1

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

Change-Id: I1be1112a20df9f4be274eaae4ec02dde03336f43