Merge "LogicalDisplay.updateDisplayGroupIdLocked should not update DisplayInfo...

Merge "LogicalDisplay.updateDisplayGroupIdLocked should not update DisplayInfo directly" into udc-dev am: f817f842 am: 3625de69

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



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