Merge "Add new @SystemApi for specifying AddressType and IRK"