DO NOT MERGE - Allowing only a subset of display attributes to get overridden.

b/20854184

Change-Id: If6b2486ba8ca93e8f96d3bdbe8e140c736353683
(cherry picked from commit 4b4c7f98869f5394b738bbc91b3775b6f4026189)
1 file changed