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

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

Change-Id: Ie373ca3f846f24672d61ebb34216eba3daeff0f9