Merge "init: Set a property indicating that we're booting into a GSI." am: 1cdd96cb10
am: bf1bcf4cad

Change-Id: Id4f9f0c62c45a26710bcf3c09917493827cc941d