[automerger skipped] Merge "Fix inaccuracies in BatterySaverPolicy cache...
[automerger skipped] Merge "Fix inaccuracies in BatterySaverPolicy cache invalidation" into rvc-dev am: 46b85fa6 am: d4b6dc88 -s ours
am skip reason: Change-Id Iab981286b321a6e9f235e01a62a3ea7cb13d4133 with SHA-1 84cebabd is in history
Change-Id: I2cd53f549f27a6d20156a8e78566a095299cd6fc