Merge "Setting result earlier than onPause" into sc-dev am: c57c351060

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

Change-Id: I56777a5df9c5af025e5298c0c73d0ed151c31c37