Merge "Rewrite field classification remote callback" into udc-dev am: c5824ef7b3 am: 9508ce7095

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23400245

Change-Id: I46eb488d921b0dca4ba7b138c835aa9adba82faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>