Merge "Merge "Make source color textColorSecondary" into tm-dev am: 707b5348...

Merge "Merge "Make source color textColorSecondary" into tm-dev am: 707b5348 am: 8632a0a0" into tm-d1-dev-plus-aosp am: 329ffe5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635986



Change-Id: Ifb169e536b154a2c2dd415f83c04cf11c183e67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>