Merge "Remove inconsistent @Deprecated behavior in *removed.txt files" into main am: 4b757daf

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



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