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

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

Change-Id: I2b1cea0a553e4291f8617fea12e132a41410b93c