fixed bad conflict resolve from fe1edd208e

Change-Id: I51b548cd203068526fc061700c764672fa206725

see comment on https://github.com/androidarmv6/android_frameworks_base/commit/fe1edd208e70c559490329c538bafd99538122e2#commitcomment-2405467