Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b9 am: fb0ec0bb

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

Change-Id: I1b78772f5b35d7a97df52e1c38af4c78d4745272