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

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

Change-Id: I451ab4c6595c6cb04bea187aac20545af3907be6