[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 07590428db74a2f7f9171efeb03cfd8b77599ddb to stage-aosp-master am: 5c6acbba -s ours am: a7d59f3c -s ours am: f3ba256f -s ours
am: a00966a8 -s ours
am skip reason: change_id I02e3afc896bf9421080a6bcfa1d7fec93096fe52 with SHA1 e2112060 is in history

Change-Id: I64cecea3e575336a3fb6a0f997b6f74067849727