Merge "Add new fields to DataProfile" am: 02d2df7135 am: 7f3dc1b0d0 am: 0bf501ade3

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

Change-Id: Iefbc68f535e99acafd38b76a791c5eb32c4351ef