Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd27 am: 973b5cf1 am: efe2e53b

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

Change-Id: I0b60eca820cb01c63f673250ac5e17c02d321dd8