[automerger skipped] Merge "Report non-empty system boot reason when...

[automerger skipped] Merge "Report non-empty system boot reason when bootloader reason is empty" am: 92820c26 am: 8ce40397 -s ours am: f7abcd06 -s ours
am: 4c0874be -s ours
am skip reason: change_id Icd3ea4b69ef2ad040926e2b0e121a8f5f1c1b658 with SHA1 699e342b is in history

Change-Id: I272203edd273533958071479ff01a786e049f526