[automerger skipped] Merge "Explicitly take flags in createContextAsUser()" am: a7948ddcb9 am: d52db070cd
am: b0100311bf -s ours
am skip reason: change_id Id2e3d5ffe5887a4916e0872a7e85d62cbb439744 with SHA1 e5449f0b34 is in history

Change-Id: I9a4d46116ac2d0cd74e939f6d55c6c320524a21b