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

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

Change-Id: I5a1fd70b0e4bdb66b23a61594d8cab62ea1aac3a