port of PA commit

https://github.com/ParanoidAndroid/android_frameworks_base/commit/dc59617045b2be327d6bba48a99de64e41d5a20c

Change-Id: I568be4680576b6294eff993a1c6faf1f70b379a0