Merge "Remove diag mode for cfi" am: e392f2cf63 am: 3489cf2f07 am: 9755af671b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id114481a334ca14e96e4d4696458b8ca686f3e55