Merge "Do not set side stage position" into udc-dev am: a85de1fb am: 1e422b93 am: 851008d6 am: d3fa5650

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



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