Merge "Temporarily disbale FaaS on legacy Flicker tests" into udc-dev am: 522dd5c3

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



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