Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f am: 81830b2d5f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31534b93bdf67d8f6bfcb6839644157d25c1d100