Merge "Remove --hide-package options from droidstubs" into main am: 274c141462 am: e1b39acd88

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

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