Merge "Remove unnecessary check and prevent unnecessary log" into tm-dev am:...

Merge "Remove unnecessary check and prevent unnecessary log" into tm-dev am: 8670fcdf am: 36ba0f34

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

Change-Id: Iaf257f5169269dddf63c0fed8b24fe7236d3c521