Merge "Refactor: Remove unused branch." am: a9f7998ff4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820992

Change-Id: Ic4a2d7911ab6d30d24b27596c42069e534f99db9