Merge "Support primary bouncer => AOD UDFPS device-entry transiiton" into main