Merge "Don't report displays that are going to be removed" into oc-dev
am: 5a270bcd66

Change-Id: Ia6ab4420855c9d1e33b7fc29985fceff7cd154fd