Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours" am: 9b8871acdd -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: I7a3ffae0323b4f0d1eff7fd88ad574040866338f
This commit is contained in: