Merge "C2 Vts: Update memory usage flags in video encoder tests" am: cefbca5902 am: d5d253e899 am: 9f92a01f7a am: 2c8232ccc9

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1754816

Change-Id: I347b9c7253db04b228ec19da6b106351ba97c548