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

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



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