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

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

Change-Id: I82f29cbf4972faf69276428692cc944efb209b02