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

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

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