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

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



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