Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6

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

Change-Id: Ib95e1f34d7fa382d05c6e191ddb021b5bf5dad3c