Merge "Bluetooth OOB: Fix getLeAppearance" am: ef0304a087 am: 2988998bd3

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

Change-Id: I8128fda817ab902cdf760acb731316f49faf07b2