Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main...

Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main am: 7df02055 am: 062315a1

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



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