[automerger skipped] Merge "Move charging indication vertically on time tick" into pi-dev am: 5baaf461a6
am: a9cd9d475b  -s ours

Change-Id: I740c9a64e364ad33bdbd5622a845b0d14c5777d5