Merge "Remove unnecessary null check to make code consistent" into sc-v2-dev am: 559dbb90

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

Change-Id: Ib895721f70e444c79b66ffd1e4c7905c15094ee8