Merge commit '4ccf0ab7e0db77dfa81a02cf724b1a219445f71d' of sso://googleplex-android/platform/hardware/qcom/display into HEAD
Change-Id: I3330a9b3327a13fe24aa354c46d8b4d8862a6ace