Merge "Remove root layer when clearing mLayersPendingRemoval" into tm-dev am: b089aa579f

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

Change-Id: I120e406e831cff49e1af3309c220f0bff596c9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>