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

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



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