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

Change-Id: I7913f0ce73270e7b1ee99026929dcda45fde369a