Merge "scroll capture: Recover gracefully when anchor view is lost" into...

Merge "scroll capture: Recover gracefully when anchor view is lost" into udc-dev am: 4d859e7b am: 5a0e8af0 am: 54286a94

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



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