Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 3f2fd2e060
am: cbc2f0cb06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023 Change-Id: Ia35782ab41d09b267c193e6b56a803409e62a28d
This commit is contained in: