tree 01f685250dab37183b8a6538493af0dab1e254d1
parent 46c5b2b9b7b23066d797318b2a7d9092c3d0a6ad
parent a22469be272923388a24e24835afe2adefe1fad1
author Bill Yi <byi@google.com> 1600492982 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492982 +0000

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a22469be27

Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/1430122

Change-Id: Icf3ce6de0fc298e6af1e60b34921b122f324e968