resolve merge conflicts of c449ba34d8dc2b605e419515249c0ef3c299306a to udc-qpr-dev-plus-aosp

Ignore-AOSP-First: Cherrypick from AOSP
Bug: 301165896
Test: Build
Change-Id: Ic8585b0d9602a244dc1a14d8d3302db1a93b0799