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: b145225c am: 2a83b59a am: 00a5e559

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



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