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

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

Change-Id: Id085eaf54bea49549e410328afec88df7e8ef8f0