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

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



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