[automerger skipped] Merge "Framework did not notifyDisplayInfoChanged." am:...
[automerger skipped] Merge "Framework did not notifyDisplayInfoChanged." am: a20f2ce6 am: d8e2bd46 -s ours am: 079bd727 -s ours
am skip reason: Change-Id Idc7cbf4f60e9818eb8d2b433b77c6729e5a023eb with SHA-1 7e6442a9 is in history
Change-Id: I0f4c80e8bf427ea72e256438ef81922fae14dee2