Merge cherrypicks of [16407185] into rvc-platform-release. am: a4641f8330

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/16493506

Change-Id: I8d8cdd74c24d3269775c99c195a2336c3e9b241c