Merge "Fail startup via ResolverActivity.super_onCreate()" into tm-qpr-dev am: 93587561b4 am: 15736cb87a

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

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