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

Merge "Move the dist rules from monolithic to merged rules" am: 99398da5 am: 3b8ec2dc am: 88901af2

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

Change-Id: I2d3150f9b3a071f25236a09b07fb9c5bf008480f