[automerger skipped] Merge "Merge similar data profile - ignore gid...

[automerger skipped] Merge "Merge similar data profile - ignore gid difference" am: d403dae9 am: 7c9054f7 am: ec6766ef -s ours

am skip reason: Merged-In Id203a3ba71adb3783edcf2c1e1f885c129e9328a with SHA-1 cd5d8c80 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378848



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