Merge "app: aboot: Keep the non-secure device unlocked by default"