Merge "Make UdfpsHbmCallback a dependency of UdfpsController" into sc-dev