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

Merge "Do not respond to ACSD if authing for keyguard" into sc-dev am: 09cb5879 am: 66c82ac9 am: 7dd6c2e6

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

Change-Id: I949161793beb94517a643929ac9619fa788695e4