tree 05f89e68ed7d6fe487b23331ffcf17d64f45986d
parent 8087d9e0d8bbaf8bf92f1b89f044dbdc2a6b2949
parent 9d45ea1185db7081857943980b235332b12eb3d6
author Sarah Chin <sarahchin@google.com> 1641415721 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641415721 +0000

Merge changes from topic "usage-setting-hal" am: 932926691a am: 9d45ea1185

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

Change-Id: Ied148d267874c5ed65783391020298528c0cdd3c