Remove unnecessary ConfigInstaller handling am: cbe72026bb
am: d16db222ae

Change-Id: I779fdf8d853318edc35ababd83d3f1c4696d411a