Merge "Clean up prebuilt stub deps & add comment" into main am: e1d899f2 am:...

Merge "Clean up prebuilt stub deps & add comment" into main am: e1d899f2 am: b6bb6b70 am: b45e69de am: 00858e6d am: 49b6157f

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



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