Merge "Fix NPE from dependency initialization order" into tm-qpr-dev am: d293b3b310

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20610250

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