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

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

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