Derp bracket fixes for 'Fix volume key music controls and wake up'
Merge branch 'L' of github.com:SimpleAOSP-Lollipop/platform_frameworks_base into L