am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if started by...
am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '320b9534':
Allow app to stop lockTaskMode if started by manifest attribute