Merge "Revert "Temporarily disable FaaS on legacy Flicker tests"" into udc-dev...

Merge "Revert "Temporarily disable FaaS on legacy Flicker tests"" into udc-dev am: 6bb1e7bb am: 8f68ba6d

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



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