Merge "Add sepolicy for gsid properties, and allow system_server to read them." am: 8bcd43a33e
am: 879acc21ef

Change-Id: Ia17feb294904b8e8054640f18f85766e3caa9399