Merge "Generate genrule modules for merged api txts" am: faea0b39ec am: 02bf418739 am: be5132914e

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

Change-Id: I93d962076fc0e48fbcba08b23786f859ff9b781e