[automerger skipped] Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from...

[automerger skipped] Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users." into qt-qpr1-dev am: 002deeda
am: 26adde7e -s ours
am skip reason: subject contains skip directive

Change-Id: I2b47a6f53915902de3602c0375e8366d9655257d