Merge "Do not set side stage position" into udc-dev am: a85de1fb am: 1e422b93 am: 7f48bfe7

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



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