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

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

Change-Id: Iddf95d3ab4ff4121482e599b3c0c1be2dc72a7c3