Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev...

Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev am: 21f890cc am: 922a9695 am: 4c651d37 am: 107781d9

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



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