Merge "Build framework-doc-system-stubs with system stubs." am: bc7044d235 am: 2ab185586f

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

Change-Id: I82a2ab808fc99cb5f95bbbb18f94856aca1f293b