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

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



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