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

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

Change-Id: I3a9666b8bfad5ca05cb7093be8d8bef4106c0b34