Merge "Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29 am: 95f38f35 am: 04b85ce6" into rvc-qpr-dev-plus-aosp