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

[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9 -s ours am: e605577e -s ours am: e7d923d2 -s ours am: 59e2ad1b -s ours am: 04e153a4 -s ours

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

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

Change-Id: I66241fb1c4ed997d50050c36ed4784e4c467599b