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

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



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