Merge "Merge "Ignore failing tests." into rvc-dev am: e5c1670a am:...

Merge "Merge "Ignore failing tests." into rvc-dev am: e5c1670a am: d3c9d54f" into rvc-d1-dev-plus-aosp am: b20997cc

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

Change-Id: Idaecd47ab23e324d6ac3e3c6cbc54da09cc02e09