Merge "Remove interrupter." into main am: a8b10c99b0

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

Change-Id: I1018ec507640e0423b49d4ba78b065231217e086
Signed-off-by: Automerger Merge Worker <[email protected]>