[automerger skipped] Merge "Adds support for restore dexopt flag" am:...
[automerger skipped] Merge "Adds support for restore dexopt flag" am: 91c72e79 am: 6e73ee58 -s ours am: 5e8a03e6 -s ours
am skip reason: Change-Id If9ff54277d02d54c7b2dbb2659b708de6eecd500 with SHA-1 00d3f4f8 is in history
Change-Id: I0cfd34eca688ff11f92a6c260219f132e3e0fb1d