am d0021dca: Merge change 8740 into donut

Merge commit 'd0021dcae7f474c062f23a449bdd18be5e882d7e'

* commit 'd0021dcae7f474c062f23a449bdd18be5e882d7e':
  Fix issue #1991230: DisplayMetrics.displayHeight is not updated with orientation change