Merge "Collect update_engine logs in dumpstate"
am: 4d69f8ace9

Change-Id: I4003418fd5ffd00e38afbfef116e4716acf9b869