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

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

Change-Id: Ie20cb0fe7f442c56908d57ec07e7b8e00c4e9ec2