Merge "Merge "Add support to USER_IDENTIFICATION_ASSOCIATION_PROPERTY." into rvc-dev am: a772a420b0 am: 04efab36b9" into rvc-d1-dev-plus-aosp am: 86af6ee90a am: 3d120ac2c8

Change-Id: I7dc0378d3a34ca7e6f90c21b6dbbba6f8b8603b2