Merge "Force verifying updated priv apps on boot if enabled"