Merge "Skip VisualQueryDetectionService being destroyed for SDK bump" into udc-dev am: e3176790 am: 68c0c0ee

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



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