Merge "setTrebleTestingOverride" am: 38e441c215 am: 11c78c7ef3 am: 84f2f99962

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1357666

Change-Id: I3e8222caf993343f88941f2964b3920e20ec5648