Merge "Merge similar data profile - ignore gid difference" am: d403dae9

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



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