Merge "le advertisement address type settings" am: f28ab362fc

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

Change-Id: Id9118f04509122b7b9a311f33e9076f7c3272296