Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev