Merge "When a dex file is loaded with different contexts, dexopt with...

Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4a am: 64c20457 am: 939a1ea1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I7144b96ad4887ea46a04eedc604421688295fee8