Merge "Revert "[nearby] Add disable logic"" into udc-mainline-prod