Merge changes from topic "sf_display_proto" into sc-v2-dev am: cab54c46

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

Change-Id: Ib0f2060ccbd25baec1b31781efbddf726e28582b