Merge \"Merge \\\"Update DisplayMetrics when resizing\\\" into nyc-dev am: 34ccbe035a am: 40b4ca8435\" into nyc-mr1-dev-plus-aosp
am: 9e380fb8d1

Change-Id: I277d5e9daf29796d81cf325a3eb762db8d4bb230