Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8 am: 7f94d2ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289

Change-Id: Idb8f5835dfc4c8aa73d6134a645eacee4f6f4fd5