Merge "Report non-empty system boot reason when bootloader reason is empty" into qt-dev
am: c39fcd42d7

Change-Id: Iadbf136ae1f2b567033750cfd12302ab2c4b2dce