Merge "Merge "Merge "Fix race condition of removing surface." into oc-dev am: 07a21754f4 -s ours am: 688a98b415 -s ours" into oc-dr1-dev-plus-aosp am: ce5bca335e -s ours" into oc-mr1-dev-plus-aosp
am: af052f9cea -s ours
Change-Id: If2ae8075111a912977deb53496084e939ac79fab
This commit is contained in: