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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfccefc4c1076c9eb058db7eb713aa5323d734c7