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

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

Change-Id: I49da09393e200f1d789f7625cb150e6d00ad052b