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

Change-Id: I5ae7088e129992262e8403da35aacb44502016b0