Merge "Disable component alias" into udc-dev am: 6b539038e9 am: 9f671d8e90

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

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