Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143cd am: 195fba40d3

Change-Id: If8e0eee5337975623e786f78b41f4a3ce5d9601f