Merge "Merge "Fix a logic error in `getDexoptNeeded`." into tm-dev am: e8a08386 am: 66439a2a am: 186fe15c" into tm-qpr-dev-plus-aosp am: 995eb51a

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



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