Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am: 6f87503ed8 am: c52b16c97d" into oc-dr1-dev-plus-aosp
am: ffb8035798

Change-Id: Ia47a2b128545b22e9dcbdd7273a2f71b07efa27b