Merge "Merge "Add white edgelights to AOSP" into qt-dev am: 0bcd6984 am: 67302596" into qt-r1-dev-plus-aosp