Merge "[automerger skipped] Merge changes from topic "cts-batterysaving-on-batteryless" into pie-cts-dev am: 0bad72a6 -s ours am skip reason: SHA1 0bad72a6 skipped by user kinaba"