Merge "Allow gatekeeperd to read ro.gsid.image_running." am: 731e104acc am: 15ae14f060
am: 008fe2d1e2

Change-Id: Icc9cedee4b38478991b8e96bc21edec61ddd0c51