Merge changes from topic "zumasystemdlkm" into udc-d1-dev am: 86fdd03b13

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22086762

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