BatteryService: Restore the original parcel order

Append the dock extensions to the end of the parcel to preserve
compatibility with the original parcel format.

Change-Id: I92112e244ab85d6c93e8e5ebf37de8257af6413a

Conflicts:
	core/java/android/os/BatteryProperties.java