Add logic and tests for getRemoveIndexSql

Change-Id: Ifbca2d9f98f73e66740e1126c76283511fdf2745
Merge "Add logic and tests for getRemoveIndexSql"