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

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

Change-Id: I8dbe15269ed213a19c6a4ead78275d4748cf86bd