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