Merge "Remove controls from carousel when not in manager" into sc-dev am: 1c3d54b979 am: 1460b849f3 am: fd1aee30d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161370 Change-Id: I9196668cd0fed7cd955a344cebb5fbd77af5e067
This commit is contained in: