Do not override mColor with default color if none set

Bug: 15163105
Change-Id: Ibb9507b24aeaae7a571d42eb411aff25449d48fe
2 files changed