Merge "Remove legacy subscription code" into udc-dev am: 97f689db

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



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