Merge "Make RemoteEntry flow independent" into udc-dev am: 572d61cf am: b99742a4

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



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