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