Merge "Do not respond to ACSD if authing for keyguard" into sc-dev am: 09cb5879 am: d46431b8 am: 8195ec0d

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

Change-Id: I220844ca86dcbce62a31bee85f3be824fd7d5284