[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours am: e605577eed -s ours am: e7d923d28a -s ours am: 59e2ad1bd5 -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061631
Change-Id: Ibb8e7cc064f854403e2d6eb67d80230666aeaad1
This commit is contained in: