[automerger skipped] Merge "Fix NPE for...

[automerger skipped] Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev am: efea2ad2 am: 79ecb086 -s ours

am skip reason: Merged-In Icecd76d6ff5a81afdcdb7d584ae3ecff51ac5dc3 with SHA-1 0f88f8c9 is already in history

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

Change-Id: I55ea2dd2ac39ebfe13114449bc91944210a76535