Merge "Remove references to old FaaS test rule" into tm-dev am: 49afccb1 am:...

Merge "Remove references to old FaaS test rule" into tm-dev am: 49afccb1 am: 4f3db836 am: babec4ee

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



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