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

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

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



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