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: 07081ae3 am: 0d96af8c

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

Change-Id: Ib4d007afa377615a445ee6c97d89813927a48b8f