Merge "Drive-by clean-up: remove redundant operation" into sc-dev am: bc32bd8cba

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

Change-Id: Ic3d44d09a56e5f3e74a22123c2bdb0ceb0e65678