Merge "Expose SdkExtension in the system SDK"
am: 370add0c6a

Change-Id: Id919746def89bdd40f33851a13da145f6686b27d