Merge "Fix NPE when passing displayId through handler" into sc-v2-dev am: d9dede17af am: 0b80eb78bb

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

Change-Id: I934348cc7567d29297628a245d23a22cace28bb7