Merge changes from topic "revert-15560568-b194781951-flags-8-ZUNMWRYIZP" into sc-v2-dev am: d520787878 am: 0b5bc8eb8e

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

Change-Id: I716404f450668f151bceccff8aa23014daf3df55