Merge "Fix duplicate-call issues in remote-display-change" into tm-qpr-dev am: 5198657b

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



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