Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev