Merge "Disallow copy & paste from personal to profile under policy" into pi-dev
am: 22d10bc586

Change-Id: Ie4cec95ab77024d92f0923600c341c6baa7707c1