Merge "Merge "Fix One-handed tutorial looks janky on entering transition" into sc-dev am: ed889bb8 am: b62b4923" into sc-v2-dev-plus-aosp am: 76a2685d

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

Change-Id: I70be60795c50bbe509fe174c4ed5763484452d5f