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

Change-Id: Ic94a3f8808ce0c5ee7de0c6c8256725b7af6b515