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

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



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