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

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

Change-Id: I9c6ddc9b5d08dc19bbc95721c0a951455a5372ab