[automerger skipped] Merge module-lib-api-stubs-docs and -non-updatable am: e19ebc502e -s ours

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

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

Change-Id: Iaf6bdc95e772e0e204279e43db13c5091313583e