Change the CP2 logging to be correct order. The order of the logging fields must match the one in atoms.proto. am: 16a3c34791 am: 05ba014696

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

Change-Id: I4df2dc3d655d76e1298ad70b70c3ce63a7b313de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>