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

Change-Id: I1eaa12467b64fedb671385343da509aa539c9d6f