tree 04bf19ddf1a71ef764511cb6aae97a3f96650721
parent b0dc6f47c468af1c5d15f894c2e2f46701eb751d
parent c5b95938cdff58418631a04e05b092dfdb8ed076
author Tyler Gunn <tgunn@google.com> 1573228679 -0800
committer android-build-merger <android-build-merger@google.com> 1573228679 -0800

Merge "Fix issue with failing ContactsProviderTest."
am: c5b95938cd

Change-Id: Idefe89ca63dcd88173ced087c0d2609acc2d30b2