[automerger skipped] Merge "Expose SdkExtension in the system SDK" am: 370add0c6a am: 021426e9dd am: 9a81162d49 -s ours
am skip reason: Change-Id Iae1b025685344c2ffe4ed1089850b447c82a6b83 with SHA-1 dc1e99bbca is in history

Change-Id: Ic9910dc5812c34f0c92829070f61c54a83284dd4