Merge changes from topic "br-stream-zip" am: c9e0e9efd4 am: 4bc2fd9b50

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

Change-Id: I32de5531c6933be17d44577b0f93b1405cdac84f