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

Change-Id: Ie609dc28fc97f1973eea4bebea0089e35d97f47f