053a7e3743
This reverts commit 17f7406a5e.
Reason for revert: To be submitted after the fix for b/273614966 is downstream merged into udc-dev (ag/22102493).
Change-Id: I3038b46776815069898829e46321885278b1caff