Update volantis workaround to cover L MR0.5 (5.0.2) (from AOSP)