[automerger skipped] DO NOT MERGE: manually cherry pick am: 8ee1a5b7 -s ours...

[automerger skipped] DO NOT MERGE: manually cherry pick am: 8ee1a5b7 -s ours am: a2215042 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3212155



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