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

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

Change-Id: I27d922022cdb39b7dd78b7df4e9618a02d142ee9