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