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

BUG: 18725105
Change-Id: I384fde4c9b36c948e995841469b1061da763584d
Merge "Update volantis workaround to cover L MR0.5 (5.0.2)" into lollipop-caf