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: 633be2f7 am: 61a5bf97 am: 102acf42

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



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