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: 6cdadcd2

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



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