Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411 am: 99f78994cb
am: 6ec170d867

Change-Id: I8cd8e422b81ff44620bf0ae901b032a28bed2eec