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