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

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



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