[automerger skipped] Merge "Dedupe build rules for non-updatable sdk libs" into main am: 7301cbe4c6 am: 0792d99bfb am: 52dfe96628 -s ours

am skip reason: Merged-In I5b596821ce9c20d2504728bf01f4fdd69da9a94e with SHA-1 4d48117ca0 is already in history

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

Change-Id: Idbfa0f135008b22a6d3e1fe927242bc803a005f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>