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

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



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