Merge "HwBinder.setTrebleTestingOverride" am: 3804ae082c am: 8b6e909cbf

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

Change-Id: Ia8da014470547dc469b2de12700aa57fea4c9af1