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

Change-Id: Iaaeee4b5fb811b2d4782901aa2da1c66c4a09155