Merge "HwBinder.setTrebleTestingOverride" am: 3804ae082c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358164

Change-Id: I40185eae30a1304e8602657289a64a7b235c32a7