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

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

Change-Id: I66546bb36c73a9c7dce0736c4bc496f08874f5e4