Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_hardware_lineage_interfaces into leaf-3.2

Change-Id: Ie5675527523bc843ed3dbb690a92cefdbb606af6