Merge "le advertisement address type settings" am: f28ab362fc am: 77cc19d668

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

Change-Id: I0eeda16f718d3eff85e256531516aa8c63dd7f3e