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

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

Change-Id: Ia67d9babc06760b4cb72ed1d0f056c6214390483