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

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



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