Merge "[automerger skipped] Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29f3 am: 2895bf9d70 -s ours am: ca6aa4cc9e -s ours am skip reason: Change-Id I991a427dc2ab00399188b10b266ab2d9aa92696d with SHA-1 38767932a2 is in history" into rvc-qpr-dev-plus-aosp