am 918537dc: am 0501cdbc: am 2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"

* commit '918537dc764dc2a8e266fc5f89fd072d34656688':
  sf: Fix incorrect state reporting in dumpsys