Merge "Add gctype device config property for GC experiments"
am: e24b30b7d4

Change-Id: I5c78c553e1bd1fe610e797c5f6ca4cc1a711721c