[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 9acd72c6 to stage-aosp-master am: 3020e050 -s ours am: a6ff7d96 -s ours
am: 86e2c421 -s ours
am skip reason: change_id I2fcf25264c62acc801f9e62967072cd04e4641e7 with SHA1 be2b0a71 is in history

Change-Id: I59258916c3fed23348a28830c14c21490cfd9079