Merge "Fix SettingsHomepageActivity crash during configuration change" into...

Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d

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



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