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: 37d733fd

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



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