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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05eae5a726581e4889289ecd7cf8269d22da023e