Merge "Prevent setting position to a surface attached to leash" into tm-qpr-dev am: eecdde18

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



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