Keep supporting wildcards matching in Q. BUG: b/127353494, b/131655000 Change-Id: Ib020d665f9a3b927645d6362d0bda84050927d17 (cherry picked from commit 0d10b25a)