Merge changes from topic "transfer touch - spy refactor" into tm-mainline-prod am: 72a5dcf9

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



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