[automerger skipped] Merge "Dedupe build rules for non-updatable sdk libs"...

[automerger skipped] Merge "Dedupe build rules for non-updatable sdk libs" into main am: 7301cbe4 am: 544d75b7 -s ours am: 693798c0 -s ours

am skip reason: Merged-In I5b596821ce9c20d2504728bf01f4fdd69da9a94e with SHA-1 14e7f959 is already in history

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



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