Merge "Fix NPE when assistant component name is null" into tm-qpr-dev am: f0734a24 am: b3139bec

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



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