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

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



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