Merge "Add new @SystemApi for specifying AddressType and IRK" am: bf516b9e11

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641559

Change-Id: I616502ee58d95cbc20fd38b395f7f0e294b5713e