Merge "Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev am: 9a89a81625 am: 3429cb905d" into rvc-d1-dev-plus-aosp