Merge "Remove the "android" package from dexopting." into udc-dev am: bc95ba3231

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

Change-Id: I4f80fd84e7a823935858aec1662c61fdec6877ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>