Use ContentHandler for the Gadget namespace

Bug: 69318
Change-Id: I0c7a0b36918202f7f17c1304fe7b4976e18b1d49
Merge "Use ContentHandler for the Gadget namespace" into RL2