[automerger skipped] Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486e5 am: 288898968d am: c2603116e7 -s ours
am skip reason: Merged-In Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d with SHA-1 867f94c755 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697266
Change-Id: I7208d67f45df60af9d8c81cc2c9138cb0dbf2b5c
This commit is contained in: