Merge "app: aboot: Enforce flashing restriction only for user builds"