Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev am: efea2ad2d9

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

Change-Id: I1baa7c9ac5cc0f9fff5d195f836a2562801f48bb