Merge app-specific and generic user data for field classification.

Bug: 118617202
Test: atest CtsAutoFillServiceTestCases
Test: atest android.autofillservice.cts.FieldsClassificationTest android.autofillservice.cts.UserDataTest

Change-Id: Ibb958e0ca790d798c7c62bce5f7dbc108041fe07
6 files changed