Merge "Merge "Skip VisualQueryDetectionService being destroyed for SDK bump"...

Merge "Merge "Skip VisualQueryDetectionService being destroyed for SDK bump" into udc-dev am: e3176790 am: 564502bb am: f126341c" into udc-qpr-dev-plus-aosp am: 009f6cf6

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



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