Merge "Dist the merged api txts for normal builds too" am: 208cdcbf3f am: a1e66b4d43 am: 4b0e3f92ae

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

Change-Id: I7da61b66389948d08c64cb69a51a7a1904546abd