Merge changes from topic "interruptions-refactor--1" into udc-dev am: 53711e83 am: cfc81d53

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



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