[automerger skipped] Merge Android 12 am: a7de7b95de -s ours am: 4b8fdc2b42 -s ours am: c5679ee1c1 -s ours

am skip reason: Merged-In If1994d3809629429ecb684d6f58b2cbd28fddd22 with SHA-1 84a1d14b6b is already in history

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

Change-Id: Iaa61633d24493ab0f5dff418f8cc3ebfd3c853ad