Merge "Don't set stem." into main am: e7481aefa6

Original change: https://android-review.googlesource.com/c/platform/development/+/2824521

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