Merge "[IT4.1] Clean up to remove no-op logic" am: af0c29529d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd472961055fbfc3d40b8982c4ae1118d58351e7