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

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



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