Merge "Avoid NPE on ScrollCaptureConnection callbacks" into tm-dev am: 6678f5566b am: afe7d710c3 am: 94dd6c9056
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18463432 Change-Id: Iadb556af8015fed69ef84b8aca088e023e6ef186 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: