Merge "Switch from deprecated -stubpackages to --stub-packages" into main am:...

Merge "Switch from deprecated -stubpackages to --stub-packages" into main am: eaceceda am: 5e81a24e

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



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