Merge "Revert "Revert "Remove full api surface from-text stubs java_api..."" into main am: 28501b72b7 am: a08f815474

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

Change-Id: I1f0c12a4552aadb8113ed4bffa98396af0cc9645
Signed-off-by: Automerger Merge Worker <[email protected]>