Merge "Fix some bugs with display iteration/removal ordering" into sc-v2-dev am: 45613c7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981905

Change-Id: Id808fb2b4a90fbd7ad220971429af8f525be65ee