Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9

Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4