Snap for 6285821 from d3a9311b16fb9d402f6b62dd7eabf6a4c8c782cd to qt-qpr3-release am: 2487fd2eb5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/CompanionDeviceSupport/+/10637972 Change-Id: I9e9c41253f0f13621ce5157e8f4da04f068b4620