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

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

Change-Id: I21c282f211c5d7291f2e684fee490a6b005a721f