Merge "Revert "Use calling package name for CompatChange."" into udc-dev am: 78c86a17 am: 6eb0d1bb am: 67678f37 am: 3f869282

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



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