DO NOT MERGE - Merge ab/7272582 am: 098fda2600

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/1736102

Change-Id: I4f62a53e6187ca2a26879a0acea5c6d0c47adbfd