[automerger skipped] Merge "Add gctype device config property for GC experiments" am: e24b30b7d4 am: 5af7ce8d28
am: 3b7debb0d6 -s ours
am skip reason: change_id I30a2a3bcfb83f502f168c0d8588d80982a5f7d76 with SHA1 d2a975adb5 is in history

Change-Id: I45dede8c042d6f34a0c51e2a1c7b54e1a23ea5d5