Merge "Generate merged public and system stubs" am: 36a4915c86 am: e3ef18e4da

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

Change-Id: I7ca7d906afd6a226a208181632b43ca986f4d925