Merge "Move the dist rules from monolithic to merged rules" am: 99398da506

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

Change-Id: I6fbbea431b2d385036135491c509afc0db887571