Merge "Create the ID for each gating key. Modify the names and descriptions per Compat team requirement." am: 5aa9de8cf1

Change-Id: I8e0d56a3d40b37340175e9f547ca0ac232177f71