Merge "Make framework-doc-stubs use jarstub defaults" am: d285e2e002 am: c09b6ce67c am: 1954870920 am: c54bd9e2cb

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

Change-Id: I0172d0f524018d5836ba902dcd32a44508bf33c8