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

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

Change-Id: I6893404a3be32848b3344ecf69d5161da27777b0