[automerger skipped] Lock targetSdkVersion to 25 am: ae02a3dc38 am: 95bb8e9244 -s ours am: bbefcdc7d5 -s ours am: 00caba4a81 -s ours am: 0fef535600 -s ours am: 02cd55aa63 -s ours am: 902e5dd09b -s ours am: 97e9d28426 -s ours

am skip reason: Change-Id Ic03a16f75505fae42e612338408276221a39d3ab with SHA-1 1b6bebaac1 is in history

Change-Id: Id4df043cdacfbab9df4caca9d267189e2fe28b19