Merge "libaudiohal: do not erase port configs if resetting fails" into main...

Merge "libaudiohal: do not erase port configs if resetting fails" into main am: 3c903be5 am: 6d2c65c2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3125167



Change-Id: I315ce952a87ed9f782bd7c958937853781cc6404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>