[automerger skipped] Make framework-all composed of other framework jars am:...

[automerger skipped] Make framework-all composed of other framework jars am: 7a9bc4eb am: 5febf61a am: 40d78634 am: c0d34d74 -s ours

am skip reason: Change-Id I1cea62aaedb7e653648130e3d315761c0c9aece4 with SHA-1 2d6c4278 is in history

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

Change-Id: Id0f8775bd86b2a9ccbd46da403ec0742c3ad2ff6