Revert "Merge tag 'android-6.0.1_r22' of...

Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/FMRadio into cm-13.0"

This reverts commit 96d3e2b0, reversing
changes made to fad359fd.

Change-Id: Ia96e54482f257667941c01fd3c351b00c367df65