Merge "LogicalDisplay.updateDisplayGroupIdLocked should not update DisplayInfo directly" into udc-dev am: f817f842 am: e298e7cd am: 347a2648

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



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