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

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

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

Change-Id: I5892fd5ccef2bbff3ad756b354325eec4e234c39