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

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

Change-Id: I775a7f76c79c32b4b6096f7bbfce607b8f3168e5