Merge "Add DOOR_LOCK to default config." into oc-dev
am: c63bdfbd74

Change-Id: I2386d09d237957da9f7ea146412b5a36cbf208a6