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: 226365a5

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



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