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

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

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



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