Merge "Update settings for app hibernation" into sc-dev am: a922c902

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

Change-Id: I70d1671e6934821af56b2564e943c5812979af1b