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

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



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