Merge "MediaCodec: avoid double lock gralloc buffer" am: 762f74e018 am: f6f0bdd100 am: 99b5b46eba am: ce30f8308f BUG:201620357 Original change: https://android-review.googlesource.com/c/platform/cts/+/1869470 Change-Id: I0c643a6f6efaccc75666afff0a927d41d74b161e (cherry picked from commit 69b08bda162fb8c8836471a029cddfa4526b5fbc)