Merge "Fix a flicker problem on top app bar" into sc-dev am: 43aeef53 am:...

Merge "Fix a flicker problem on top app bar" into sc-dev am: 43aeef53 am: dc746971 am: 187c52c2

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

Change-Id: I90e140912660f74d53490c485886b85b2e4ed0ff