Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev am: 613d0cd8fb
am: 7c3716792a  -s ours

Change-Id: I4d2ef7b1f975bfed783b3e0c40225c5f7b9cfc13