Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc6c331894be59140f379a443260edaafc05aa1