Merge "Consolidate the behavior and style of side stage outline" into sc-v2-dev am: 49c02984

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

Change-Id: I9a98cf4a2b13d153aeee45e30ab964a20249bb98