Merge "Merge "Added DISABLED flag to users flag for HAL" into rvc-dev am: 110f2bef7f am: 286cc6e608" into rvc-d1-dev-plus-aosp