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

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

Change-Id: I8c06adefb681d1e00dde180221c96edd96778581