[automerger skipped] Merge "fix: Invalid subscription plan cause NPE" into...

[automerger skipped] Merge "fix: Invalid subscription plan cause NPE" into sc-dev am: d0e38d0a am: bafab978 -s ours am: 378bb58c -s ours

am skip reason: Merged-In I835a7b8890035975e187ca0a70ec2f30ca56455a with SHA-1 be369675 is already in history

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

Change-Id: Ie66f2a674513dd31e455fad8c76c42e1cbd0c8ff