Merge commit 'bcaada0ca1adf2bc8420bb4ce5ce2bb073b2db62' of sso://googleplex-android/platform/frameworks/opt/colorpicker into HEAD
Change-Id: Ibbbd7779e940abc993f763c8a31652f8b331c615