[automerger skipped] Merge "Add new fields to DataProfile" am: 02d2df71 am:...

[automerger skipped] Merge "Add new fields to DataProfile" am: 02d2df71 am: 7f3dc1b0 am: 0bf501ad am: 0b263c0f -s ours

am skip reason: Merged-In I6c756d42616149a2eed0ba705ffaaeb17d7a014f with SHA-1 1657db82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918537

Change-Id: I7bfda45fe40b0ea4e28a1c980140ed78bb63dd2c