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

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



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