[automerger skipped] Cherry-pick spirit of 23abbfeb am: 208bbdd2 -s ours am: 7d400e83 -s ours am: 75cd8c67 -s ours

am skip reason: Change-Id Id2013f80dbc962f70ccb1b687c0dc18fef372348 with SHA-1 23abbfeb is in history

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

Change-Id: I879c69b01d91eb768273fde9bf33093a71b2f516