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: I1f54d27cbf01a39c38c347917a43eed933e51565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>