Merge "Lower battery indicator on AOD screen" into qt-dev am: 478b6810d8
am: 67225c0ffe

Change-Id: I3dfd9bf93f27a3be0dfb569299160571275c487e