Merge "Remove comments of privacy.proto to avoid this accidently go to AOSP" into pi-dev am: d382087795
am: caa251aecd

Change-Id: I9b84640732abb187268ab8e18a1e3d82091f83ca