am 864ef233: Merge change 4878 into donut

Merge commit '864ef2337554cd0ca4166873bc8145d21ccf2286'

* commit '864ef2337554cd0ca4166873bc8145d21ccf2286':
  Add smalltest annotation to HardwareServicePermissionTest.