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

Change-Id: Icc0676638901084968a175384bf3530495df93c7