Merge "Fix the crashes in am_perf tests" into udc-dev am: f0b858b2

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



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