Merge "Wait for user unlock before setting up external storage" into stage-aosp-rvc-ts-dev