Merge "Ignore InterruptedException from Thread.sleep()" am: ffdc8928ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3b6c12f0aa70cf9fe0c5ca84803b24a22cb5982