Merge "Avoid playing the charging ripple on reboot." into sc-dev am:...

Merge "Avoid playing the charging ripple on reboot." into sc-dev am: 7b8e968a am: 4fa456a0 am: ce9a8a27

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14715991

Change-Id: I3fa7236d425b7f2d97f45505f1fe5bb808e50c8d