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

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



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