Merge "Set initial density to a fixed value" into nougat-cts-dev am: b72f32556d am: e9c67e17cc am: 3f48a1b376  -s ours am: 1884f9071c am: 0afb9c6252
am: 56add2a1f4

Change-Id: I85cae78c43ed4d6dc5c2238d1fc17860e81866fe