Merge "Merge "Enforce system/root/shell for dexopt operation." am: c900ba3c" into stage-aosp-master am: c8c54db5

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

Change-Id: I1e4e1988efbfe900444fa985cbe7015c021000ac