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

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

Change-Id: I07989422551350844cca963568e671ed7ce310b0