Merge "Fix for CtsProviderTestCases" am: b628c5d9a2 am: c730a23451

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

Change-Id: If614966efa249bc93d7da8dd387c83a95c13fc18