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

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

Change-Id: Ica608fed4831e43727c24584778964b485c17410