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

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



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