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

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



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