Merge "Update privacy filter for incident report protos." into rvc-dev am: f9a1e1cb78 am: 19ad54b69c am: b157f1da12

Change-Id: Iad8ce5bd562b166efc24fcb9af32fdcc3a30d607