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

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

Change-Id: I616502ee58d95cbc20fd38b395f7f0e294b5713e
tree: 13c5799168ab5ece237f43ba2f99f970f5631d2a
  1. framework/
  2. service/