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

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

Change-Id: If78fb3baa7e8198ee8fb39c890df172e6c691408