track al display-caf

Change-Id: I766379a2b54bb0ba361f35ac114a2eec91698db8
Merge branch 'cm-11.0' of ssh://review.android-legacy.com:29418/android-legacy/android into cm-11.0