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: If67d9a4eea51a02bb6c27ea4ba222d6d7c017ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>