Merge "testVfsCacheConsistency: Error message is startsWith fails" am: a1afbb430c am: d5196274f5 am: e4289ea107

Original change: https://android-review.googlesource.com/c/platform/cts/+/1513799

Change-Id: Iced6acad6a5f50d1c5fa332bd8405f595c0085f3