Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b  -s ours
am: 53405b51c8  -s ours

* commit '53405b51c8d85388b316c5884cfe441e80429f41':
  DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated