Merge "Use tapl instrumentation to go home." into tm-qpr-dev am: 9a817344 am: 685c2304

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



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