Merge "Merge "Don't create StateTrackers for whitelisted atoms" into rvc-dev am: c20fcfeeff am: 6090c54943 am: b50522fa1a" into rvc-qpr-dev-plus-aosp