Merge "Fix unlock transition double offset nested tasks" into udc-dev am: eceec17e

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



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