[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 1faafcb4 to stage-aosp-master am: d7ecd0d2 -s ours am: 711f3753 -s ours
am: 38d25435 -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5c is in history

Change-Id: Ic01b6410f413a4b44f59955691399d9895c00c43