The source project of this merge request has been removed.
Z01R: Import from lineage-18.1
Please merge this. I just cherry-picked the existing commit from lineage-19.1 branch as it hasn't changed (and won't since there's definitely not anymore stock software updates).