Merge "Return no optmization info for package "android"." am: f6b27d6a81 am: 8fbe829de0

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

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