Merge "Explicitly take flags in createContextAsUser()" am: a7948ddcb9
am: d52db070cd

Change-Id: I7ed103b7c148508635818e779b55a585b1540c85