Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 0e0069fae4

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

Change-Id: Icf00d17ab0a721c9248ff3b0dca0be578a5fb3ca