Merge "Convert AppCompat*View tests to activity rules." into mnc-ub-dev