Merge "Add null checking when deleting hotword detectors" into udc-dev am: c3b7d1b2

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



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