Merge "Do not set side stage position" into udc-dev am: a85de1fb am:...

Merge "Do not set side stage position" into udc-dev am: a85de1fb am: 4e531b9a am: f59bee61 am: 7583c612

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



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