[automerger skipped] Merge "DO NOT MERGE Disable example codec2-service by default" am: afedc4533f am: 16b57aca29 -s ours am: 9570bdda35 am: dd187e07a4

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

Change-Id: I6faf0e4a0f5392302de395f319b47cc6bba02bc6