am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev
am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev

* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base