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

Merge "Merge "Return no optmization info for package "android"." am: f6b27d6a am: 8fbe829d" into tm-qpr-dev-plus-aosp am: 83e5e365

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



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