Merge changes from topic "interruptions-refactor-1" into udc-dev am: 57029c61

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



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