Merge "Fix TextAppearanceInfo#getTextColor is wrong when there is a hint text"...

Merge "Fix TextAppearanceInfo#getTextColor is wrong when there is a hint text" into udc-qpr-dev am: 77ccd8bc am: 26047899

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



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