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