Merge "profcollet: Fix possible NPE" am: b57c42cb43

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

Change-Id: I82f170b2b4ecdb3194a381e1147014bad9d74ef2