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

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

Change-Id: Id0a594a3f00e9a2cafdced22c62ab9d8238d494b