Merge "Remove inconsistent @Deprecated behavior in *removed.txt files" into...

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

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



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