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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebb4d1a9682e7ae6bdb3e491f9e1020b8ce66edf