[automerger skipped] Replace timeout errors with Face not recognized. am: 3e869b8f -s ours

am skip reason: Merged-In Ia97e7f92000c82d121afba16a70ee3db33911815 with SHA-1 504c55a3 is already in history

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



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