Merge "Remove implementation details from stub flags in sdk snapshot" am:...

Merge "Remove implementation details from stub flags in sdk snapshot" am: 03f951d0 am: bd597134 am: 54bbc2a4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056470



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