Merge "Fix downgrades on device with FRP enabled" into udc-dev