Merge changes from topic "interruptions-refactor-0" into udc-dev am: fb67b8af

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



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