Merge "Internal Telephony Support For Cellular Identifier Disclosure HALs" into main