Merge "Some static-analysis-based code cleanup" into tm-qpr-dev am: 19fa09d48a

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

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