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

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

Change-Id: I616cb6a16f12d75327b1c9a7e86a6ce796f68b99