Merge "Remove redundant Nullable annotation for  applyDisplayChangeIfNeeded method." into main am: 1849a4c116 am: 2faac87d96

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

Change-Id: I3f7ca95a2ee1ae9ff640846a6241a14d84e32ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>