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

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



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