Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7

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

Change-Id: I17cb9dc98f6b8299871a82bd29be8bdf78effbfc