[automerger skipped] Merge "Migrate apex/sdkextensions to packages/modules/SdkExtensions" am: ed293d17 am: a71dd3bf -s ours
am skip reason: Change-Id I0009d286205d7942c2d681936bfba38e074700d2 with SHA-1 5b49b293 is in history
Change-Id: Iec290a9423f436dc3022c40ded9581fdd0fa6855