[automerger skipped] Merge "Support data profile merging" am: 88e08cbb am: 32898f85 am: 1a353ab2 -s ours am: 550caf53 -s ours

am skip reason: Merged-In I6f398321cc972be0b5fb4c550f7a110049d896f6 with SHA-1 014dcb62 is already in history

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

Change-Id: I4aa1872e1502bac9b983993bef7a7b7ef23673af