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

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

Change-Id: I572d69b637a9f41ab3fc17c5b81b528737ffc2e6