[automerger skipped] Merge "Merge RQ2A.210305.007" am: 02fe3b1af9 -s ours

am skip reason: Change-Id Ib881ff1602d3ad6f910d60a6d301ace7ae76c379 with SHA-1 c49194457f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1613631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c920423ec9f0b0e7079517dc782797bac824bca