Merge "Swap hal query order" into tm-qpr-dev am: 4c5ec9874c am: 78bf1dade5

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

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