Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am: bd355dbf58 am: d62d68785e  -s ours am: ed6f463636  -s ours
am: 33a431e9a7  -s ours

Change-Id: Iacdf898375e36053b928f9669ddc4090d16a707e