Merge "dumpstate: Add security log dump" am: bc611a1d3e
am: 0c124edf7c

* commit '0c124edf7c633588e300f1855d22739194ba7194':
  dumpstate: Add security log dump