[automerger skipped] Merge "Merge "Atom for when fgs accesses appop" into...

[automerger skipped] Merge "Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29 am: 95f38f35 am: 04b85ce6" into rvc-qpr-dev-plus-aosp am: 3db23b84 -s ours
am skip reason: Change-Id I991a427dc2ab00399188b10b266ab2d9aa92696d with SHA-1 38767932 is in history

Change-Id: Iaedf34e3cee420861a8a0e25ca9a68ffa6ddd544