Merge changes from topic "remove-duplicate-br-calls" am: 9b795b5f56 am: f2879207a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafa18f64a67ed8bbc5ca0b191a336865cdc09426