Merge "Fix flags assert in validateProfileData" into oreo-mr1-cts-dev am: d8b66c5f63

Change-Id: I2275f4601c5cbcad76a19e30de7abbd87fed3c2f