Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert" am: 82bb853f

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



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