[automerger skipped] Allow entering rescue mode via recovery UI. am: 378bfbfc5c -s ours
am: ee2b4024bf -s ours
am skip reason: change_id I913dbdbcffd3179e6fa72ca862f74ca8f1364b02 with SHA1 c6dc325e88 is in history

Change-Id: I09fa15cb768674ba4a36a26a72b58421a653ee26