Merge "le advertisement address type settings" am: 68a509b817

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

Change-Id: Id9118f04509122b7b9a311f33e9076f7c3272296
tree: 54affd319f751bace7f7085c55e9690ca102de6b
  1. framework/
  2. service/