Merge "Merge "Remove textColorSecondary override for EditTextActivity" into...

Merge "Merge "Remove textColorSecondary override for EditTextActivity" into tm-qpr-dev am: 7f391b59" into tm-qpr-dev-plus-aosp am: 84d264fd

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



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