[automerger skipped] getCallingSid: get calling security context am: 683b6d043d
am: d7acd8a870 -s ours
am skip reason: change_id Ia8a4c0cb4a9c86dcc0d3b7583014237f879a3074 with SHA1 f0a7d7899e is in history

Change-Id: I373c99de28c510c92b516d13a0c7d07f28ea0142