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

Change-Id: I7be7ab51b28eb99ed7229874a91a42f386547e1c