[automerger skipped] Merge changes from topic "usage-setting-hal" am:...

[automerger skipped] Merge changes from topic "usage-setting-hal" am: 93292669 am: 9d45ea11 am: 82e0f6a9 am: 3d11f23f -s ours

am skip reason: Merged-In Iea5e016878f375608a167ad0fdc232fd2e743fa6 with SHA-1 055c02fc is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1935057

Change-Id: I0eb0c3ca17566336dee77c742ed53342c06122af