Merge "Prevent SystemCaptionsManagerService init from blocking unlockUser" into rvc-dev am: ae34fd76ff

Change-Id: I84677cc70a3a0905810ce863975fecae1057ff1b