Merge "Show masked value for sensor with permission" into cw-f-dev
am: ee36adbde7

Change-Id: I755533dbff110702bbf851c8e0a6ec2035fa28c2