Merge "Fix color contrast in search view" into arc-apps
am: 8739b37375

Change-Id: Ie8b35924a8a3d2df1042c8b48474eb43880ad0bb