Merge "Revert "Enable receiver for update user sensitive"" into rvc-dev am: 2328849cc6 am: 8ec416efc2

Change-Id: Idfe53d83d79481e6ce3bc94886845168b943e3ed