Merge "sepolicy: new prereboot_data_file type" am: e8b7cecad3

Change-Id: I1250ca1cdd98f428438bb1e50d7c7c6fa5f0989e