Merge "sepolicy: new prereboot_data_file type" am: e8b7cecad3 am: b98676bc7a am: 4cfad4bd0c

Change-Id: I730e1d0c934f5588c9dc3e6f6de98ee6eaae7aab