Merge "Enable nested scrolling for locale picker" into sc-v2-dev am: 67e26d74 am: 4e3b453b

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

Change-Id: Id5310dbc54ff4c797362982d0641fbda6d23a6bc