[automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e

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

Bug: 224685744
Bug: 224627240
Change-Id: Ia36ebbd31829e9e33d8fd559d228e139e63e679e