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

Change-Id: I3369d14bd2fd7f7c0c09204727035ffa0a5f6e35