Merge "fix case test failure before secondary user is unlocked." into stage-aosp-rvc-ts-dev