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

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



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