Merge "Merge "Move disabling battery saver to the base class" into qt-dev am: 70a10280ac am: 61938e53a2" into qt-r1-dev-plus-aosp
am: 5cbb897ad9

Change-Id: I882ed778f682007476822d12185562357b2448a2