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

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

Change-Id: Ib9f1edae14e29a01c3bcd44374ea55cf1ed7c6b3