Merge "Remove interrupter." into main am: a8b10c99b0 am: 50c98c8d24

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

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