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

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

Change-Id: Ib2e7f6b0575ee13fc1c341f1fb566e60920a621e