restore missing Add button on key types page

Bug: 1012404
Change-Id: Idd0e77782e86186c8ef2d1fc5df06541aad28a26
Merge "restore missing Add button on key types page" into release-0.15