[automerger skipped] Merge changes from topics "deactivate_no_tds",...

[automerger skipped] Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert" am: 82bb853f am: 8fb0b7d8 am: cab7c559 -s ours am: 5e230aef -s ours

am skip reason: Merged-In I43bcb551bbb8775ed489822ca3ad3fe3af7e9c0b with SHA-1 271e0b6d is already in history

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



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