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

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

Change-Id: Idbd1d85af8b7b6e8ba30678fbd067b56ed218214