Merge "Remove unnecessary null check to make code consistent" into sc-v2-dev...

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

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

Change-Id: Iba79c4dd7d294b6a46be4e62a3a4409ebfdcd566