Merge "PropertyService: Exclude sanitization for darwin" am: 5a7a8f2f17
am: 040b849f5a

Change-Id: Idc017ee189d9ebe5acdb59c9fb379b46f8dfa1f1