Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev
am: fdef00a5ae

Change-Id: Ia3a12099b9c87d5fc655a4f0b4afb7b96da674af