[automerger skipped] Merge "Update navigation bar upon change of display density" am: f46b14b6af am: 87401e095d
am: 96bc3ed083 -s ours
am skip reason: change_id I6d2d7ac4a801fac6f30bb78acee4c00ec2c4e507 with SHA1 eef0e0c326 is in history

Change-Id: I9a6118847cc53e1ee7a47ed60c7419a4431bf36b