Merge "C2Store: disable debug logs" am: 92de33261c am: e2f8408c36

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

Change-Id: I8a214cff0a17f2d2b367afbde420ddcd0ff583a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>