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

Change-Id: I15a2059027ef42a69a801d3ba126f59a9b3cc063