[automerger skipped] Merge "Add targets to build doc-stubs for non-updatable"...

[automerger skipped] Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486 am: 28889896 am: c2603116 -s ours am: c2baf8f5 -s ours

am skip reason: Merged-In Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d with SHA-1 867f94c7 is already in history

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

Change-Id: Iacaefb3a910e3d48c6fe5b6a161d669e48fd4676