am 3dcea047: Merge change 4237 into donut

Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been