[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9...

[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9 -s ours am: b4b6c7d2 -s ours am: 3d32aa68 -s ours

am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 fa861a6b is already in history

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

Change-Id: Ic2e13b4b30228ed5b20cefef8014c580924e7364