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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60e62b3601d42ddab187d8561b9723328558b42b