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

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



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