Merge "Re-submit "Change the default docs build to use module stubs"" am: eb2333936e am: 643efb7cfb

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

Change-Id: Id4ffc6505a2da185a17940dbc61e9d956126202a