[automerger skipped] Merge "Remove unused monolithic jars" am: fd4bcbd7 am:...

[automerger skipped] Merge "Remove unused monolithic jars" am: fd4bcbd7 am: dd64b2cb am: 942afe4c am: a6fdffee -s ours

am skip reason: Change-Id I7859589b93b861439fb1b7de084e52294da53671 with SHA-1 65aa6ea9 is in history

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

Change-Id: I2e908255329cf8485026fa1ea225261359173411