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

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



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