Merge "Fix snippet part for Mainline Fast Pair API changes." into tm-dev