[automerger skipped] Merge "Merge module-lib-api-stubs-docs and...

[automerger skipped] Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68e am: 2f20e9af am: 10d116d1 am: 2cb250d6 am: 64c0906e -s ours

am skip reason: Change-Id I9e8038b3899270ada12ed4cc057aeace2a36902d with SHA-1 f4a486ec is in history

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

Change-Id: I05fcf0c6f37323b0f66e6959a44c273d64ed02b6