[automerger skipped] Merge "DO NOT MERGE ANYWHERE: Do nullptr check on source filter" am: ce765a74ca -s ours am: c0060083c6 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712728 Change-Id: Iebf0edd209d532ac2cda39e32f03b1188ff58200
This commit is contained in: