Merge "Stop using _upstream suffix." into main am: e0fa880b am: 08b5eb03

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3434333



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