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 am: b5fcebde

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

Change-Id: Id64f6017e54e27d97c822e62a85e0221a2454bfa