[automerger skipped] Merge "Generate merged public and system stubs" am: 36a4915c am: e3ef18e4 am: 241f82b7 am: 72b04cd5 -s ours

am skip reason: Merged-In I0d35f1e76320356ee4e5535a40614cf7d8ff4486 with SHA-1 04ab8c66 is already in history

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

Change-Id: I74de8e2b3285dd4dc530da62bf8aed899a74a58c