Merge "Port fix for lockscreen test over to keystore copy" into stage-aosp-pi-cts-dev