Merge "Decrease memory usage for sleep idle test" into rvc-dev am: f1a65df0...

Merge "Decrease memory usage for sleep idle test" into rvc-dev am: f1a65df0 am: 5d37336e am: 81d612d5

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

Change-Id: I3a0fdbbbbad03659c0329803a2a9224d15e51c28