Merge "Fix flags assert in validateProfileData" into oreo-mr1-cts-dev am: d8b66c5f63 am: ee275cc481 am: 630d550b05 am: 2395bc22a0

Change-Id: Idb51df9c21b1e7714e52e528faa574c45027507f