Merge "configstore: include crash_dump seccomp policy" am: 25080b1fff
am: ca8d5c9250

Change-Id: Ie39010c1005df44b412002d010b709cb73cfc2c7