[automerger skipped] Merge "SampleSyncAdapter minsdk bump from 8 to 21" into main am: aa6d1bb37a -s ours am skip reason: Merged-In If8fa2a693150487a30418bb708ceffb20f8a15ad with SHA-1 e5f72a02d6 is already in history Original change: https://android-review.googlesource.com/c/platform/development/+/3146160 Change-Id: If1d22f09878adc01b7f7cb23acae07198d410674 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>