Merge "Avoid potential recursion of surface placement" into tm-qpr-dev am:...

Merge "Avoid potential recursion of surface placement" into tm-qpr-dev am: a55a6425 am: 3c522643

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



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