[automerger skipped] Merge "[DO NOT MERGE] Fix founction not found on tm cts tests" into tm-qpr-dev am: 3b3c628f am: 36960320 -s ours

am skip reason: subject contains skip directive

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



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