Merge "Rewrite field classification remote callback" into udc-dev am: c5824ef7

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



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