Merge "Update renamed util function M3HCTToColor in launcher code" into aosp-main-future