Merge changes from topic "sync-flicker-sc-v2-dev" into sc-v2-dev am: 2461e951b9

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

Change-Id: Ibc4032ed2e927bf20aee4c97c57bad3cb88912f4