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

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

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