[automerger skipped] Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
am: 6352eaf0c0
-s ours
am skip reason: Merged-In I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 with SHA-1 1b6ab7ec90
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I42f5ce40b81f2cb4dc20c57e8fd9ee5c6615f367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: