[automerger skipped] Require unlock for custom SMS dialog am: 41606094d4 am: 5fce345b14 -s ours
am skip reason: Change-Id Ib6822436bcebc799e7e920f1a5898d107dd619db with SHA-1 fab2f0fddb is in history

Change-Id: Ifd50a5adbcc855db3938f39aebee4e34efa7ccc4