Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06

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

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