Merge changes from topic "sync-flicker-sc-v2-dev" into sc-v2-dev am: 2461e951b9 am: e630d2c9eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879490 Change-Id: I1f48fa775e339a49bab3e64192cc934ab024bc31
This commit is contained in: