[automerger skipped] Merge "Create the ID for each gating key. Modify the...

[automerger skipped] Merge "Create the ID for each gating key. Modify the names and descriptions per Compat team requirement." am: 5aa9de8c am: de7f6750 am: a2390390 -s ours
am skip reason: Change-Id Id9d0366714aa4ecb240d2b9e726d35a474879325 with SHA-1 b32797b2 is in history

Change-Id: If90738df203c3a2dc442c4c6b13ad56ad3bb21e7