Merge "Add white edgelights to AOSP" into qt-dev
am: 0bcd698481

Change-Id: Ia226601e07740dfe5c78273580bb50e7174e6476