Merge "Prevent setting position to a surface attached to leash" into...

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

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



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