Merge "Dedupe build rules for non-updatable sdk libs" into main am: 7301cbe4c6

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

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