Merge "Add ROLLBACK_RESISTANCE definition to for KM4"
am: 6ec7a6f455

Change-Id: I49efe8901a9f3bded329bebe9934164f7e94a2e5