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

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

Change-Id: I2c5a7e44058749a969b290aec09405d4310aeed1