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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5f5ea15335e2fffc62b474a1f5d63f4c9170dc3