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

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



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