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

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

Change-Id: I508f04191182df39edf9ec1d0d7bab3e59e5b2bf