Merge "Key management test: Run with StrongBox (for P)" into stage-aosp-pi-cts-dev