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

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



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