Merge "Transition a second time if background doesn't arrive on time" into...

Merge "Transition a second time if background doesn't arrive on time" into tm-dev am: 9f3f150f am: 39c0fc90 am: 3d767062

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



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