[automerger skipped] Merge changes I3ab20b76,I08e69319 into udc-mainline-prod am: a4158239a5
-s ours
am skip reason: Merged-In I3ab20b76a60cab66a27784b7d87a069813d19835 with SHA-1 f8aaaa13f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24691974
Change-Id: I3d7696aae5f14b1c364d2d74e22bf4a11e5cfcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: