Merge "AM: introduce ActivityOptions.setLockTaskMode()."