Merge changes from topics "b194781951-flags-5", "b194781951-flags-6",...

Merge changes from topics "b194781951-flags-5", "b194781951-flags-6", "b194781951-flags-7", "b194781951-flags-8" into sc-v2-dev am: 6fe47701 am: b8616971

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

Change-Id: I20cc126d7519dc2480c8b929a3a51670f626425b