Merge "Assert the output file of header-abi-diff" am: 9f8239f8d4 am: 202191db4f am: a4c76dbecd

Original change: https://android-review.googlesource.com/c/platform/development/+/2337408

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