Merge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145 am: c717e603b1" into oc-dr1-dev-plus-aosp
am: 137d09aa07
Change-Id: I98d23f7b5d87bb09dc5287319e4f94e6236f0027
This commit is contained in: