Merge "Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29f3 am: 95f38f3524 am: 04b85ce627" into rvc-qpr-dev-plus-aosp