Libavc remove diag am: bb48f97189 am: a51b27bfea am: 43e3bf110c

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1549583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc1551275b55ed64ff2a66ce666357074af5c49a