Fix removal of dock battery views in PhoneStatusBar

removeView is not recursive. Find and remove the dock views from their
direct parent. Fixes inconsistent paddings/margins with the wi-fi
indicator on tablets.

Change-Id: I56745059aaf84b1e52b6a4fd8806481beae0daff
Fix misspelled comment

Change-Id: Id13737b3a40eeee70ec0816aebe551d34ce89691
Merge changes Id13737b3,I56745059 into cm-10.2

* changes:
  Fix misspelled comment
  Fix removal of dock battery views in PhoneStatusBar
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2