Merge changes from topic "be-kind-rewind" am: 8678720c99 am: 0d55ffab3d

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

Change-Id: Ib6bd988f56bf72ff51c16bc68e906ef3bd626fc9