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

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

Change-Id: I0b91e1d00602e173d7f1e290c45812138e1f58f2