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: 06ae4fae

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



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