Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486e5 am: 288898968d

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

Change-Id: I9ee3bbc9c0e21b23ef2cc0c38e2254da9f28c925