Merge "Prevent the screen reader box from unexpected scrolling in dream...

Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a0 am: 2119a2dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324



Change-Id: I38545423c8784f826265ece8aef6a75662cb7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>