[automerger skipped] Merge "Report non-empty system boot reason when bootloader reason is empty" am: 92820c2676
am: 8ce4039734 -s ours
am skip reason: change_id Icd3ea4b69ef2ad040926e2b0e121a8f5f1c1b658 with SHA1 699e342b3d is in history

Change-Id: I1a205c51e8c525a3e48c0d7e2762182fbfc1e799