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

Change-Id: I32e623a718404bb536ec84aa9fa33544c0cae799